From 704fa1532801bc02c4500462f0b913b3c137db4d Mon Sep 17 00:00:00 2001 From: Andrew Cooper Date: Tue, 9 Oct 2018 13:48:57 +0100 Subject: [PATCH] x86/mm: Simplify promote_l4_table()'s exit semantics promote_l4_table() is different from its lower level helpers, by having an extra return path out of the middle of the loop in the case of a failure. Break from the loop, which is consistent with the other helpers, and functionally equivalent. Signed-off-by: Andrew Cooper Reviewed-by: George Dunlap --- xen/arch/x86/mm.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index c14c677a62..594f1bd290 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -1856,10 +1856,7 @@ static int promote_l4_table(struct page_info *page) } } if ( rc < 0 ) - { - unmap_domain_page(pl4e); - return rc; - } + break; pl4e[i] = adjust_guest_l4e(l4e, d); } -- 2.30.2